From: Chad Horohoe <chadh@wikimedia.org>
Date: Mon, 10 Dec 2012 18:33:12 +0000 (-0500)
Subject: Applied patches to new WMF 1.21wmf6 branch
X-Git-Tag: 1.31.0-rc.0~21339^2~2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=b92b9b62c0c93d16c93541ea1cd5afa5d60eef52;p=lhc%2Fweb%2Fwiklou.git

Applied patches to new WMF 1.21wmf6 branch
---

diff --git a/.gitreview b/.gitreview
index 0ec44b8359..435b8fd2b9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/core.git
-defaultbranch=master
+defaultbranch=wmf/1.21wmf6
 defaultrebase=0
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c2f7ea6d08..e90a065e41 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -59,7 +59,7 @@ if( !defined( 'MEDIAWIKI' ) ) {
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion = '1.21alpha';
+$wgVersion = '1.21wmf6';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename = 'MediaWiki';